Merged from 2.4

Sun May 16 22:53:47 2004  Matthias Clasen  <maclas@gmx.de>

        Merged from 2.4

	* io-pnm.c (pnm_read_next_value): Don't read integers
	partially.  (#142584, Kouichirou Hiratsuka)

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 59c86dc4acda3df200fd1b384ce98e3b4f7764dc..489bba04da4d52996b25eedcb4d0e642cc2863b1 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,10 @@
+Sun May 16 22:53:47 2004  Matthias Clasen  <maclas@gmx.de>
+
+        Merged from 2.4
+
+       * io-pnm.c (pnm_read_next_value): Don't read integers 
+       partially.  (#142584, Kouichirou Hiratsuka) 
+
 2004-05-10  Matthias Clasen  <mclasen@redhat.com>
 
        Merged from 2.4:

diff --git a/gdk-pixbuf/io-pnm.c b/gdk-pixbuf/io-pnm.c
index 437ccaf0e0547da325122cfcba7fa70b3916c83f..39b7d363379db54b2c11cb9e304d0a41f229dc65 100644 (file)
--- a/gdk-pixbuf/io-pnm.c
+++ b/gdk-pixbuf/io-pnm.c
@@ -237,7 +237,7 @@ pnm_read_next_value (PnmIOBuffer *inbuf, guint *value, GError **error)
        *word = '\0';
        
        /* hmmm, there must be more data to this 'word' */
-       if (!g_ascii_isspace (*p) && (*p != '#')  && (p - inptr < 128))
+       if (p == inend || (!g_ascii_isspace (*p) && (*p != '#')  && (p - inptr < 128)))
            return PNM_SUSPEND;
        
        /* get the value */